x86: remove unnecessary ALIGN directives

ENTRY() already includes an ALIGN.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index c36a9939e148d3e57e056e9f6cc78db719fc9d84..95faacde867b5c64eb594d674d2f1bba55df253e 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -138,7 +138,6 @@ restore_all_xen:
         addl $4,%esp
         iret
 
-        ALIGN
 ENTRY(hypercall)
         subl $4,%esp
         FIXUP_RING0_GUEST_STACK
@@ -417,7 +416,6 @@ domain_crash_synchronous:
         call  printk
         jmp   __domain_crash_synchronous
 
-        ALIGN
 ENTRY(ret_from_intr)
         GET_CURRENT(%ebx)
         movl  UREGS_eflags(%esp),%eax

diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index 3b4f12c1517f68dc49d86939e376f39931848f58..1d952ac2d122f7ba32e84e78d4d58d2bbdfd0b27 100644 (file)
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -12,7 +12,6 @@
 #include <public/xen.h>
 #include <irq_vectors.h>
 
-        ALIGN
 ENTRY(compat_hypercall)
         pushq $0
         movl  $TRAP_syscall,4(%rsp)

diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index fa51287a875d627b35a020f8229e73bc770d5d30..943c845560da31491a9cc66559c13851fa689a0e 100644 (file)
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -110,7 +110,6 @@ restore_all_xen:
  * the stack, starting with %rip, and an appropriate %ss must be saved into
  * the space left by the trampoline.
  */
-        ALIGN
 ENTRY(syscall_enter)
         sti
         movl  $FLAT_KERNEL_SS,24(%rsp)
@@ -450,7 +449,6 @@ ENTRY(domain_crash_synchronous)
         call  printk
         jmp  __domain_crash_synchronous
 
-        ALIGN
 /* No special register assumptions. */
 ENTRY(ret_from_intr)
         GET_CURRENT(%rbx)